From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 30 May 2011 16:12:16 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3565^2~7
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4c9a283cbeb9c71f45ace2cb1adb5c72cd905e27;p=emacs.git

Merge from trunk.
---

4c9a283cbeb9c71f45ace2cb1adb5c72cd905e27
diff --cc src/ChangeLog
index fea9a38d608,9d40df670b3..2d7f05971e3
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,17 -1,7 +1,19 @@@
 +2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* gnutls.c: Use Emacs's memory allocators.
 +	Without this change, the gnutls library would invoke malloc etc.
 +	directly, which causes problems on non-SYNC_INPUT hosts, and which
 +	runs afoul of improving memory_full behavior.  (Bug#8761)
 +	(fn_gnutls_global_set_mem_functions): New macro or function pointer.
 +	(emacs_gnutls_global_init): Use it to specify xmalloc, xrealloc,
 +	xfree instead of the default malloc, realloc, free.
 +	(Fgnutls_boot): No need to check for memory allocation failure,
 +	since xmalloc does that for us.
 +
  2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
  
+ 	* alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.
+ 
  	* eval.c (Qdebug): Now static.
  	* lisp.h (Qdebug): Remove decl.  This reverts a part of the
  	2011-04-26 change (bzr 104015) that inadvertently undid part of